diff --git a/system/libraries/Typography.php b/system/libraries/Typography.php
index 11b3917..1ae4577 100644
--- a/system/libraries/Typography.php
+++ b/system/libraries/Typography.php
@@ -267,23 +267,23 @@
 							// on which direction to curl, with non-word characters like punctuation
 							// being a secondary factor only after whitespace is addressed.
 							'/\'"(\s|$)/'					=> '&#8217;&#8221;$1',
-							'/(^|\s)\'"/'					=> '$1&#8216;&#8220;',
+							'/(^|\s|<p>)\'"/'				=> '$1&#8216;&#8220;',
 							'/\'"(\W)/'						=> '&#8217;&#8221;$1',
 							'/(\W)\'"/'						=> '$1&#8216;&#8220;',
 							'/"\'(\s|$)/'					=> '&#8221;&#8217;$1',
-							'/(^|\s)"\'/'					=> '$1&#8220;&#8216;',
+							'/(^|\s|<p>)"\'/'				=> '$1&#8220;&#8216;',
 							'/"\'(\W)/'						=> '&#8221;&#8217;$1',
 							'/(\W)"\'/'						=> '$1&#8220;&#8216;',
 
 							// single quote smart quotes
 							'/\'(\s|$)/'					=> '&#8217;$1',
-							'/(^|\s)\'/'					=> '$1&#8216;',
+							'/(^|\s|<p>)\'/'				=> '$1&#8216;',
 							'/\'(\W)/'						=> '&#8217;$1',
 							'/(\W)\'/'						=> '$1&#8216;',
 
 							// double quote smart quotes
 							'/"(\s|$)/'						=> '&#8221;$1',
-							'/(^|\s)"/'						=> '$1&#8220;',
+							'/(^|\s|<p>)"/'					=> '$1&#8220;',
 							'/"(\W)/'						=> '&#8221;$1',
 							'/(\W)"/'						=> '$1&#8220;',
 
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 9de2b1f..245f218 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -100,6 +100,7 @@
 	<li>Fixed a bug where HTML comments and &lt;pre&gt; tags were being parsed in Typography::auto_typography().</li>
 	<li>Fixed a bug with non-breaking space cleanup in Typography::auto_typography().</li>
 	<li>Fixed a bug in database escaping where a compound statement (ie: SUM()) wasn't handled correctly with database prefixes.</li>
+	<li>Fixed a bug when an opening quote is preceded by a paragraph tag and immediately followed by another tag.</li>
 	<li>Tweaked Typography::auto_typography() for some edge-cases.</li>
 </ul>